*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05e2ba7c9e46c3e049d883a2cda81c5775d03286..cc439515e54b168d401655a3b472871586b00387 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-12  John Wiegley  <johnw@gnu.org>
+
+       * eshell/esh-mode.el: Disabled a test that often yields false
+       failures.
+
 2001-06-18  Stefan Monnier  <monnier@cs.yale.edu>
 
        * textmodes/sgml-mode.el (sgml-mode-map): Fix thinko.
@@ -158,6 +163,7 @@
        * server.el (server-process, server-buffer-clients): Doc fix.
        From Pavel Jan\e,Bm\e(Bk <Pavel@Janik.cz>.
 
+>>>>>>> 1.2419
 2001-06-09  John Wiegley  <johnw@gnu.org>
 
        * eshell/esh-cmd.el (eshell-exit-success-p): Use a string-match to